Merge "Fix unexpected VR mode exit on package update." into nyc-mr2-dev