Merge "Increase enforced widget corner radius on hub to 28dp" into main