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

Change-Id: Ied5da6f529d56ab42969aafc61497279f4c59d1a