Merge pull request #25220 from albertopq/1082917-clip-cbs

Bug 1082917 - Large message truncated on dialogs r=mhenretty
Conflicts:
	apps/system/test/marionette/lib/system.js