Merge "Assert correct nav bar visibility in overview" into tm-dev