Merge "Changed themes for core activities" into nyc-mr1-dev am: c43f05e669
am: d7772a562c

Change-Id: I8df79a7226792d09e1fa7b1dd19acc3c5865a6b4