Merge "Add rounded corners to customizer decoration" into sc-dev