Merge "Consider long system notification sound set by user"