Merge "Add log for user unlock" into main