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

* commit 'bb1d1319f202ccda89c03c5b9c972d5d91a04995':
  More changes to improve memory usage during rotation