Merge "Don't skip adding stub home task if applyLoadPlan hasn't run" into sc-v2-dev