Attempt to workaround navigation mode mismatch errors

Assuming that the nav mode state needs to "settle", adding waiting for
this.

This might be a temporary solution.

Bug: 149024111
Change-Id: Ifbd874546a4cb6b07ad3d3825c95d19bc5836b38
1 file changed