Merge "Update MediaSession/Controller constructors" into lmp-dev