Merge "Fixing issue with play/pause buttons being inverted."