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

Change-Id: Idfe8d17fc37adc7b3a74da6fdf3123cd378194d8