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

Change-Id: Ibfced93a748f3b098fb3e0a9af691b745666f916