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