am 310db394: (-s ours) Merge "DO NOT MERGE: Do not set the background to null...
am 310db394: (-s ours) Merge "DO NOT MERGE: Do not set the background to null for video." into gb-ub-photos-arches
* commit '310db394':
DO NOT MERGE: Do not set the background to null for video.