Merge "Reintroduce priority to notification sorting order." into nyc-dev