Bug 871472 - [Camera] unlocking the wakelock without proper testing creates problem in closing camera app - changes made as per Dale comments