Merge "Use a Quantity String for the autofill password count." into sc-dev