Merge "Remove more unused theme customization"