Merge "Make settings themed apps have light nav" into oc-mr1-dev