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

Change-Id: Ibf53883d951936a543c28ac070ea515625914a35