Initial QR and Camera support
Merge with simo
Minor merge fix