Merge change 23012 into eclair

* changes:
  Fix issue #2084148: Define the format for the auto focus preview for barcode scanning