Merge "Update lock icon resources" into sc-dev