Merge "Fix vr flinger deadlock and race condition"