Merge "GATT: Fix NoSuchElementException when flush batch scan results"