Merge "Merge "Make settings themed apps have light nav" into oc-mr1-dev am: 181d4a80" into oc-mr1-dev-plus-aosp