Merge "Allow corner UI to decouple from rounded_corner_radius" into rvc-dev am: c211ed5361

Change-Id: I4bcdb516b5c23353025ebb756dc43cdac60e0776