Merge "Allow media apps to receive media key events after the phone call" into oc-dev