Merge "Fix volume key events are dispatched when screen is off" into oc-dev