* commit '9c95015b0ccaa02b97b4c96950e2b07e6a5a7b4e': Improve support for the barcode-on-screen use case for wearables.