Merge branch 'next/cleanup-samsung-macro' into next/cleanup-samsung