Merge commit 'v3.3-rc1' into fbdev-next