Merge pull request #21199 from dmarcos/bug1024692master

Bug 1024692: limit image decode size to 3mp on 256mb devices