Bug 977934 - Render activity inside caller
Bug 979751 - [Security setting] Redundant "Enter PUK code" page shows

after enter incorrect PIN code three times.

- update logic
- add unit test
Merge pull request #16980 from EragonJ/v1.3-bug-979751

Bug 979751 - [Security setting] Redundant "Enter PUK code" page shows
Bug 979406 - Don't wait 600ms before vibrating when receiving a call.
r=rik
Merge pull request #17122 from etiennesegonzac/bug-979406-v1.3t

Bug 979406 - Don't wait 600ms before vibrating when receiving a call.
Merge pull request #17125 from leonazhao/v1.3t

Bug 949796 - brief flash of tiny buttons after focusing e.me search box ...
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
Merge branch 'v1.3' into v1.3t
Bug 937251 - [Cost Control] Remove proxy