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

Change-Id: I9d3492636ebc34b93d8be51b7f38de85d9ae105a