Merge "Revert "Tie vr flinger to persistent vr mode""