Merge "Rounded corner: fix layer settings when inherited from parent settings" into main