Merge "Skip updating nav bar if it was destroyed" into tm-dev