Merge "Update kg lock icon logic" into sc-dev