Merge "Update preference to set password field" into pi-dev