Changed lock state tracking to address CleverPin conflict