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