Merge "Add mechanism for customization of rounded corner insets"