upstream imports r979

eihrul (1):
      decalscale fix
fix thirdperson camera derp
fix HUD hiding during UI display