Merge "FP2-1575: Prevent activities from being started during setup" into fp2-dev-v2