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

* commit '841e4946bf3f6cbbc4a84d849de675f1d6296a02':
  Fixed a crash when the heads up content view was null

Change-Id: I093f6a7ead9920f53d539437611174ffebd998cd