Merge "Dialog on phone shouldn't say tablet" into lmp-dev