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

Change-Id: If76db6cc2520d8dd7e1c0fc688344d78a2866390