Merge "Set correct theme for MMI-related dialogs" into lmp-mr1-dev