am 0eda0765: am 43bdc5cd: am 10fb4f80: Merge "Fix theme for empty activity" into lmp-mr1-dev

* commit '0eda07657aad4a05d50896410ab56b48570e7d57':
  Fix theme for empty activity