Merge "Fix deadlock when transitioning to vr flinger" into oc-mr1-dev