Merge "Fix APS death notification"