Merge "Add extra logs for debugging unexpected persistent unlock msg" into main