Merge "Final touches to material theme for phones" into lmp-dev