camera doubleshot: Cleanup and corrections.

Change-Id: I1749164f774c3da7b10b95824b0d8ffe5d83833d