Merge "black background in image_capture intent review ui." into gb-ub-photos-denali