Merge "Exclude MediaSession2 from the media button session" into rvc-dev