Merge "MediaSession2: Add MediaSession2.CommandButton"