Merge "(Visual) Support CORNER_RADIUS_POLICY" into devel/master