Merge "Cache old VM ringtone name to avoid stutter in settings dialog" into nyc-mr1-dev