Merge pull request #8244 from davidflanagan/bug826211

Bug 826211 - correct container size for gallery pick/crop activity r=djf(cherry picked from commit 99ebe8ba7417e73ca0acf9f110ef0d781a80989e)
Merge pull request #9028 from davidflanagan/bug854168-v1.0.1

Merge pull request #8244 from davidflanagan/bug826211