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

Change-Id: I376bb2b43e31cb6078290c7fff4838c46ee8d2ca