Merge "MediaSession2: Replace PlaybackState2" into pi-dev