Merge "Refinement of auto-dimming nav" into oc-mr1-dev
am: 5b4b6bda2d

Change-Id: Id986f78ecc87693f0442534875d473c5a0fe16ab