Merge "SysUI: Correctly compare MediaControllers" into lmp-dev