am 337cf595: Merge "Fix stuck issue on Kovio barcode"

* commit '337cf59590a80d6763226e29240ee7aeb7f556f6':
  Fix stuck issue on Kovio barcode