Merge "Update widget editing highlight to match specs" into main