Merge "Use NavBarHelper to keep shared initalizing state between nav/taskbar" into tm-qpr-dev