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

* commit 'efde77aba9d9f8a9eb52d64b1b5e721191aaf41e':
  Revert "always set the initial-scale"