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

Change-Id: Iafbf773990c00f3497151442ec37fc180ce7a515