Merge "Add radius to widget internal focus to fit new focus outline design" into main