Merge "update navigation mode settings string" into udc-qpr-dev