Merge "Allow simultaneous scale and pan in magnified state." into jb-mr1-dev