Merge "Allow miniresolver buttons to overflow cleanly" into main