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

Change-Id: I5c3b9f4c162f0a313b9b5bac4697ef5fcc952f18