Merge "Don't create SCO if VR activity is not started" into p-keystone-qcom