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

* commit '9341ac980e29e6a692c4c3a61096fabbd35c9902':
  More theming fixes.

Change-Id: Id18687881ca1529f10266c58dbc8f16a42b62c33