Merge "More changes to improve memory usage during rotation" into honeycomb