Merge "Simplify the test step after changing navigation mode" into main