The fix I did last week was just refreshing the UiRootNode but it turns out we need to refresh the DescriptorFilters too (since they are null when there's no SDK.) So the old fix was wrong, what we need is to generate a new tree model when the SDK is reloaded. Original author: raphael Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 146555