Merge "Add a null check for the thumbnail image for transition" into nyc-dev
am: 2ff157c027

* commit '2ff157c027cb3eb5eddefa39617ec49aeb75a139':
  Add a null check for the thumbnail image for transition

Change-Id: Ie360192a57ee5dca8fd31b3594b803baa7ecbdb1