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

Change-Id: Ibac064cbafdfffb0078e32027e789be98e9e1358