Merge "Util classes for the Taskbar Customization Framework" into main