Bug 1040068 - Inconsistency in [contacts] buttons
Merge pull request #21792 from davidflanagan/bug1037097

Bug 1037097: restrict image decode size in MediaFrame based on device memory size
Conflicts:
	apps/gallery/manifest.webapp
	apps/sharedtest/test/unit/media_frame_test.js