Merge "Handle volume keys to apps in Vr mode" into oc-dev