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

Change-Id: Ief3663a763a7ebb33f9fdf902e6906ce8dde253a