Merge "Fix comments about CornerRadiusPolicy and BorderlineColor" into devel/master