Merge "Don't clobber in progress page transition in applyLoadPlan()" into sc-v2-dev