Merge "Fixed a crash with the headsUpManager" into qt-dev
am: fcd42e9249

Change-Id: I82fedec3d4d6f297a022f42fe29e52bffbdc222a