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

Change-Id: I50bf2f349ef246501860b940aea66ff9132c6718