Merge "Fix Settings password robo tests." into sc-dev