Merge "Adjusting Taskbar Icons for larger display size" into main