Merge "Fix default ring/alarm/notification insertion"