Merge "Add fromBundle/toBundle to PlaybackState2/PlaylistParams"