Bug 1036788 - Stop using origins to identify apps
Merge pull request #21743 from cctuan/1036788

Bug 1036788 - Stop using origins to identify apps