Merge "The drawables cache strikes again Bug #7117785" into jb-mr1-dev