Merge "Fix ContrastDialog not displaying." into main