Merge "Improve support for the barcode-on-screen use case for wearables." into lmp-mr1-dev