am fd7b8744: am e35c54eb: Merge "Allow simultaneous scale and pan in magnified...
am fd7b8744: am e35c54eb: Merge "Allow simultaneous scale and pan in magnified state." into jb-mr1-dev
* commit 'fd7b8744':
Allow simultaneous scale and pan in magnified state.