Merge "Merge "Add a null check for the thumbnail image for transition" into...
Merge "Merge "Add a null check for the thumbnail image for transition" into nyc-dev am: 2ff157c0 am: 6c0b2044" into nyc-mr1-dev-plus-aosp
am: 93b8f442
* commit '93b8f442':
Add a null check for the thumbnail image for transition
Change-Id: If4303b61e6e0c518282eeb12e1baa47406d654aa