Merge "Add some padding between checkbox and text" into main