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

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