Merge "Fixes task behavior on AIA launch" into pi-dev