#27358: Widget Customizer: Improve behavior of widget highlighting

DO NOT MERGE. This PR is for review only, and patch from it will be applied to SVN and this PR can then be closed.