Refactors Navigator into primitives only
Refactors Navigator into primitives only

Resolves #9751

Auditors: @bsclifton @bridiver

Test Plan:

luixxiul/browser-laptop,timborden/browser-laptop,luixxiul/browser-laptop,timborden/browser-laptop,diasdavid/browser-laptop,timborden/browser-laptop,diasdavid/browser-laptop,diasdavid/browser-laptop,luixxiul/browser-laptop,diasdavid/browser-laptop,luixxiul/browser-laptop,timborden/browser-laptop