Merge remote-tracking branch 'upstream/master' into sprint/HipsterHedgehog.fix.video-thumbnail-change-only-updating-thumbnail-in-users-gallery
