Merge "Increasing nav mode settlement timeout as an attempt to workaround nav mode mismatch bug." into ub-launcher3-master