am ca83651a: am b281a646: Merge "Fix video capture intent overlapping buttons"...
am ca83651a: am b281a646: Merge "Fix video capture intent overlapping buttons" into gb-ub-photos-bryce
* commit 'ca83651a':
Fix video capture intent overlapping buttons