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