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

* commit '82fd842827fcdb3570d0c606bd049f42bf2b3fba':
  Protect against ImageView changing to a null Drawable during Transition.