Merge "libvulkan: Reset window before creating swapchain am: 3d1c82a am: 47e6d2c" into nyc-mr1-dev-plus-aosp