[Bug 1269964] Rebase clufter component