Correctly calculate top corner radius

We need to also take rounded_corner_radius_adjustment into account,
as well as the custom top corner radius.

Fixes: 188614159
Test: manual
Change-Id: I5461a67981f64cbc828b6c3d77198a3dfc6c60a1