Merge "Password settings: Fix duplicate title" into sc-dev