Merge "Allow up two lines of text on dnd restrict notif" into qt-dev