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

Change-Id: I3dfe561ae65057a60cf0b86c556b717090dec86f