Merge commit 'v3.1-rc9' into fbdev-next