Merge "Allow ogg files to be selected as ringtones" into oc-dev