Merge "Associate activity config before creating application" into main