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

Change-Id: I68b2089659f5efc2a04dae04de454e3bdf0385a6