am 7850783b: Merge "Fix regression in default zoom setting"

* commit '7850783b73cda1d71e9a90a7256fe0348707f9dc':
  Fix regression in default zoom setting