Merge "Fix ringtone persistance after device rotation." into nyc-dev