Merge "Localized optimizations in views and bitmaps" into ics-mr1