Ring and notification tone related fixes and improvements