Merge "Allow ContextImpl.setTheme(int) to be called after getTheme()" into mnc-dev