Merge "MediaSession: Rename methods related to shuffle mode"