Bug 1079356 - Use "types" instead of "type" when creating APN items

Conflicts:
	apps/wappush/js/cp_screen_helper.js
Merge pull request #25560 from crh0716/1079356_v2.1

Bug 1079356 - Use "types" instead of "type" when creating APN items r=gsvelto