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

Change-Id: I39ac6a3c3b21e1f011696de0786fe4c1943a6af2