Merge "Fixed the heads up disspearing bug for real" into nyc-mr1-dev