Merge "Fix concurrent access bug in VrFlinger." into oc-dr1-dev