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

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