Merge "Auto dim the nav bar to help prevent diff aging" into oc-mr1-dev