Merge "Fix re-enabling alert window appop after leaving VR mode." into oc-dev