Merge pull request #18164 from wilsonpage/992341

Bug 992341 - [B2G][Camera] Double tapping in camera causes self-timer to