Merge "Use correct heads-up notification height." into qt-dev