Merge "Revert "Honor the sort and group keys for notification ranking."" into lmp-dev