Merge "Fix nav bar color while QS customizing." into oc-mr1-dev