Merge "DO NOT MERGE - Fixing ringtones that were put in as notifications" into gingerbread