Merge "Add max height logic and avoidance of taskbar into task menu" into main