Merge "Fix inconsistency in nav mode changes" into rvc-dev am: 5c9e323353 am: 51ae9e18fd am: 632f0d79fb am: 6b94e2b0ae
Change-Id: I0a503d9966d1847dc8ea2eb1ad485542db62c3c4
This commit is contained in: