Merge "Reorder notification settings" into qt-dev