Merge "Fix selected widget outline" into main