HUD weapon indicator persists after spectating

[b-sharman]

Describe the issue
After spectating, for example, choosing the "Spectate" button from the main menu during a game, the weapon indicator in the HUD's bottom-right does not disappear.

Expected behavior
The weapon indicator should be hidden while spectating because the spectator is not holding any weapons. Alternatively, it could show the currently selected weapon when the spectating mode is set to follow a specific player.

[TheEgghead27]

The block outline for the engineer class's Block Layer gun also persists while in spectator mode.