Revert "Revert "Bug 1027707 followup to fix notifications launching calendar" for causing Bug 1078244"

This reverts commit c3800a31b86648e10fc9ee4dac9673856df1a1f2.
Revert "Merge pull request #24733 from gaye/reland-amd"

This reverts commit 56d949e8d1c66abb5ee2a0188eac6c0974417212, reversing
changes made to d418d3d86a3e6471c902d39966df02d04d77c158.
Merge pull request #24843 from gaye/backout-reland-amd

Bug 1027707 - Proper backout of reland amd