Merge "Use grid border spacing as widget padding if possible." into sc-dev