Merge "Fix migration of O DND visual effects settings"