Merge "Update taskbar window size for flyout" into main