Merge "Refactor Choose/Confirm Lock flow to take user id"