Merge "Fix APS death notification" into rvc-qpr-dev