Update wip of bug-1103816.

Conflicts:
	all-hammerhead/gecko/bug-1103816.patch