Merge branch 'topic/vga_switcheroo' into for-next