Merge \"ResourcesManager: Apply ContextThemeWrapper config\" into nyc-dev
am: 9e9c78f8ce

Change-Id: Id216a87548da2cb2fbc3d4b5dfa7511aa293ccd9