Merge "Fix issues with duplicate starting window add requests" into pi-dev