Merge "Screen magnification cannot be engaged in landscape on a phone." into jb-mr1-dev