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

* commit '6b755582bd5793d644e08ee7eee8aa7c111e3b8d':
  Fixed a crash when the heads up content view was null

Change-Id: I53896642b751a4c5a3d31ee27473f66be8917f08