Merge "Update lock icon when necessary"