Merge "Fix inconsistency in nav mode changes" into rvc-dev