Merge "Fix update lock release" into klp-dev