Merge "Avoid NPE when trying to unlock user with wrong token handle" into main