Merge "Enforce system radius instead of separate value for widgets in launcher" into main