Merge branch 'nexus-uw-bug/column-settings-ui-tweaks'