Merge "Doubling the wait time for activity creation in PortraitLandscapeRunner" into main