Merge "Make activities that are in VR mode ignore ui mode config changes."