Merge "Don't apply transformation fudge when not rotating." into jb-mr1.1-dev