Merge "Remove old contrast dialog" into main