Bug 1079700 - Correcting errors in performance testing
Bug 1063658: workaround memory-backed blob bug 1079546 by ensuring that pick and share activities always use files

Conflicts:
	apps/gallery/index.html
Merge pull request #24954 from eliperelman/bug-1079700-v2.0

Bug 1079700 - Correcting errors in performance testing
Merge branch 'v2.0' into v2.0m.