Merge "Update camera orientation when device is flipped" into gb-ub-photos-carlsbad