Merge "Fix dismiss dialog shows on dark mode apply (2/2)" into main