Merge "Fix issue with recent task being replaced by task with another windowing mode" into pi-dev