Merge "Combine MediaSession Callback and TransportControlsCallback" into lmp-dev