Merge "Remove unused NOTIFICATION_CLEARABLE_REFACTOR flag" into main