Merge "Set MediaSession.mCallback as non-null when a callback is set"