Merge "Add spacing between items as decorations instead of margins" into sc-dev