Merge "Add focus ring to widgets header" into main