Merge "Fix alarm delivery-order sorting" into lmp-dev