Merge "More theming fixes." into nyc-mr1-dev am: 9341ac980e
am: 4a8586cfe6

* commit '4a8586cfe6fa8ab72868fb55640c8e42b8c2d0fe':
  More theming fixes.

Change-Id: I245852591812d5beaaab15011e0ad4301ffe2947