Merge pull request #14892 from etiennesegonzac/bug-948975-resume-single-conference-group

Bug 948975 - Safeguard to make sure we can always resume a single held conference call. r=rik
(cherry picked from commit 7354e63bc91309895b85ca711baa5caff2991c73)
Merge pull request #14912 from davidflanagan/bug939679

Bug 939679: compute the right camera preview size on HD devices r=dmarcos(cherry picked from commit 4245fb93e747d3e3cc9e50ba6fa2f084c9cb682f)

Conflicts:

	apps/camera/js/camera.js
Merge pull request #15086 from davidflanagan/bug939679v1.2

Merge pull request #14912 from davidflanagan/bug939679
Bug 939962: manual uplift of willReadFrequently patch to v1.2
Merge pull request #15092 from davidflanagan/bug939962v1.2

Bug 939962: manual uplift of willReadFrequently patch to v1.2