Merge "Revert "Temporarily disable enumeration of VK_KHR_incremental_present""