Merge "Refinement of auto-dimming nav" into oc-mr1-dev