Merge "Fix inconsistency in nav mode changes" into rvc-dev am: 5c9e323353 am: efefc0ac70 am: 343708087a am: 9c791037e9
Change-Id: I04770456e8d4dfd17e45614a2c080b8c8403e504
This commit is contained in: