Merge "Password settings: use EM DASH as the pwd count placeholder" into sc-dev