Merge "Height should be maxed to the height of the notification shade." into qt-dev