Merge "Change Taskbar Window height logic for taskbar pinning." into main