Merge "MediaSessionService: Stop using APIs in the MediaComponents" into pi-dev