Merge "MediaSession2: Add CommandGroup#add/removeCommand(int)" into pi-dev