Merge "Fix manual rule on upgrade to modes_ui if DND was on" into main