Merge "Associate user id with unlock token handle" into pi-dev