Merge "Remove manually set background in toolbar and grid item" into sc-dev