Merge "Fix stuck issue on Kovio barcode"