Merge "Allow notification reordering after user adjusts importance" into qt-dev
am: 798aa80cf5

Change-Id: I303d5277f07b43601f1fb986ffc135e4808681dc