Merge "Update the nav icon style in referencedesign" into rvc-qpr-dev