Merge "DO NOT MERGE Fix rotation and memory use bugs" into honeycomb-mr2