Bug 871472 - [Camera] unlocking the wakelock without proper testing creates problem in closing camera app - changes made as per Dale comments
Merge pull request #9717 from leob2g/bug_871472_camera_wakelock_regression

 Bug 871472 - [Camera] unlocking the wakelock without proper testing cre... r=daleharvey