Merge "Fix the logic for re-generating / updating the AVRCP PlaybackState"