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

Change-Id: Ifd72614d7228750551e21ea96a4a31e67eb10dcd