Merge "Cache drawable constant states instead of drawables Bug #5678369" into ics-mr1