Merge "Reset password field instead of keyguard" into pi-dev