Merge "MediaSession2: Last changes before API unhide"