Merge "Fix theme for empty activity" into lmp-mr1-dev