Merge changes from topic "b-68279369" into oc-dr1-dev

* changes:
  Auto-dim refinements
  Refinement of auto-dimming nav
  Don't touch auto dim on app change
  Auto dim the nav bar to help prevent diff aging