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

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