Merge pull request #10592 from daleharvey/879881

Bug 879881 - Add ability for activities to define maximum file size for video recording. r=djf
Conflicts:
	apps/camera/js/camera.js