Merge "Don't ignore remote media sessions when sending media key events" into oc-dev