Merge "Revert "Make PlaybackState immutable with a builder""