Bug 957709 - Patch to prevent Camera/Gallery switch buttons from being hammered.

Update patch for 957709 after djf's review.