Merge "Make settings themed apps have light nav DO NOT MERGE" into oc-mr1-dev am: 9555ed12e6
am: d6af052a35  -s ours

Change-Id: I741124bd23a1532ba481223d0dfadcd0bd591806