Merge "Change flag to the new one for haptic customization of channel notification" into main