Merge "Revert "always set the initial-scale"" into jb-ub-mail-ur10