Merge "Revert "Make settings themed apps have light nav"" into oc-mr1-dev
am: 0fbca56f1b

Change-Id: Idfd4900e068242b42c4cfc249697bd88aec7e057