Merge "video intent ui" into gb-ub-photos-denali