Merge "Fixed a crash with the heads up manager" into mnc-dr1.5-dev am: d23f1eb0cd am: 804ff964af
am: a8a4d29aec  -s ours

* commit 'a8a4d29aecd1eca223245d1db1231707992c9341':
  Fixed a crash with the heads up manager