Merge "Viewport should zoom out when screen magnification is disabled." into jb-mr1-dev