Merge pull request #18190 from justindarc/bug991367

Bug 991367 - [B2G][Gallery] The Camera button remains active beneath the...