Merge branch 'master' into develop

# Conflicts:
#	CHANGELOG.md
#	pubspec.yaml

Author: juliansteenbakker

CHANGELOG.md

@@ -106,6 +106,10 @@ Known issues:
 * [Apple] The scan window does not work correctly.
 * [Apple] The camera flash briefly shows when the camera is started.
 
+## 6.0.7
+Improvements:
+* [Android] Updated bundled barcode scanning library to v17.3.0
+
 ## 6.0.6
 Bugs fixed:
 * [web] Fixed a bug that prevented color inverted barcodes from being scanned.