Merge branch 'next/topic-update-maintainer' into samsung-fixes-2