Merge "Set the navigation position only in the right mode"