Merge "MediaSession: Rename mCallbackHandler to mCallback"