Merge "[LockSettings] pipe old password through when setting new one"