Merge "Track window position with task position." into klp-dev