Bug 1094066 - APP-CANCELLED key should handled by app first then fall back to system app
Merge pull request #26507 from dwi2/bug1094066

Bug 1094066 - APP-CANCELLED key should handled by app first then fall back to system app