am 847fbbea: Merge "Localized optimizations in views and bitmaps" into ics-mr1

* commit '847fbbeaf9e3ba187a45d0a631f0c087ce25b7f6':
  Localized optimizations in views and bitmaps