Merge "Use SessionPlaylistAgent in MediaSession2Impl" into pi-dev