Merge "Follow-up: Show RingtonePickerActivity in work user instead" into oc-dev