Merge "RingtonePickerActivity:  Keep cursor open while visible." into nyc-dev