Merge "Make ImageView drawable update more efficient in some cases." into cm-11.0