Merge "Fix race condition when enabling vr flinger"