Merge "Refactor VR state management in ActivityManagerService." into oc-dev