Merge "Revert^2 "Change PlaybackState#isActiveState to isActive"" into sc-dev