Merge "Fix nav bar color while QS customizing." into oc-mr1-dev am: 8e32aa1fc0
am: 9c3e219112

Change-Id: I9732204a186298422f671b38ffd8c05329cbc28d