Bug 986849 - image pick activity displays useless mode switch button
Merge pull request #17488 from wilsonpage/bug/986849

Bug 986849 - image pick activity displays useless mode switch button