Merge "Attempt to workaround navigation mode mismatch errors" into ub-launcher3-master