Merge "Fixed a crash when the heads up content view was null" into nyc-dev