Merge commit 'v3.2-rc6' into fbdev-next