Merge branch 'samsung-fixes' into samsung-next-base