Merge "Fix a couple of rotation bugs" into qt-dev am: 52f29a55ab
am: 4d6bb0c498

Change-Id: I0c614a43bb0372873aaec268c33fe1791b0d33db