Increasing wait time for navigation mode switch.
am: d230af4e09

Change-Id: Ia5150735244249dd76c1993ff588036e4f18402b