Merge "Fix MediaSessionManager.Callback to be called with the media button session" into oc-dev