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

Change-Id: I5446f2a53a502be0e3d2556777bc1583c7059856