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

Change-Id: I7658ab52ff09923b991da2f9aaac239ceb9e805d