Merge tag 'v3.7-rc4' into next to sync up Wacom bits