Merge "Remove nav button controller dependency on TIS." into main