Merge "Fix VR current component changes being ignored."