Merge "Get rid of divider above ringtone selector" into pi-dev