Merge "Fixes non-web AIA internal launch" into pi-dev