Merge "Add a null check for the thumbnail image for transition" into nyc-dev