am 890f20e8: am 039cc060: am 82fd8428: Merge "Protect against ImageView changing to a null Drawable during Transition." into lmp-mr1-dev

* commit '890f20e8e84e91173edf6890f5bb6da5cd0418d2':
  Protect against ImageView changing to a null Drawable during Transition.