Merge "Consolidate the check of isolated nav TF" into main