Bug 1031012 - [B2G][Camera]Self-timer cannot be canceled
Merge pull request #21354 from justindarc/bug1031012-v2.0

Bug 1031012 - [B2G][Camera]Self-timer cannot be canceled