Merge "Vol key presses: active stream has priority of set control stream" into oc-dev