Merge "Settings - Move Activity embedding split min width config to resources" into main