Merge 3.16-rc2 into staging-next

We want the staging fixes here as well.