Bug 977934 - Render activity inside caller
Merge pull request #16890 from alivedise/bugzilla/977934_v1.3/render-activity-inside-caller

Bug 977934 - Render activity inside caller
Bug 981521 - Display notifications for messages with a "signal-none" action r=julienw

Conflicts:
	apps/wappush/js/wappush.js