Merge "Configured color attribute properly for focus outline" into main