Merge "Fix inconsistency in nav mode changes" into rvc-dev am: 5c9e323353 am: efefc0ac70 am: 343708087a

Change-Id: Ib55a7f3fd993a94c4a7d5f763cd4c5aefeb60378