Merge "Revised language for notification ringtone picker." into jb-mr1.1-dev