Merge "Fix inconsistency in nav mode changes" into rvc-dev am: 5c9e323353 am: 51ae9e18fd

Change-Id: I2849ec790d4a9f3b3cedcb0ca945d1c1d3f56dbb