Merge "[SettingsLib] Extract attributes for entity header into styles" into main