Manual patch in of border-radius changes from mainline patch.