Merge "Prevent modes dialog from updating on theme change" into main