Merge remote-tracking branch 'upstream/v1.3' into mergin-1.3-in-1.3t-april-18

Conflicts:
	apps/callscreen/js/calls_handler.js
	apps/callscreen/test/unit/calls_handler_test.js