Merge "Fix issue where unlock handlers are not properly updated" into lmp-dev