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