Merge "Update lock icon color on config change" into sc-dev