am 2c7ed6e8: Merge "Improve ImageView drawable re-use" into mnc-dev

* commit '2c7ed6e80a7e9504a0c0e13a27e54332c603d1cc':
  Improve ImageView drawable re-use