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