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