Merge "Always insetting the widget by a minimum of 6dp" into udc-dev