Merge "Refinements to magnification for improved wearable support." into lmp-mr1-modular-dev