Merge "Improve ImageView drawable re-use" into mnc-dev