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

Change-Id: I22ff1854af5c5436fea0a63b83ebe43ab0c507e5