Merge "Revert "Fix padding/margin for widgets in widgetpicker"" into udc-qpr-dev