Merge "Update widget edit icon to use material colors." into tm-dev