Merge "Updated notification sounds for trygon" into honeycomb