Merge commit 'f4a09d7449ffd2480d2d3d9fcc6744d4b8dcaa66' into eclair-mr2-plus-aosp * commit 'f4a09d7449ffd2480d2d3d9fcc6744d4b8dcaa66': fix[2222341] Soft reset while going back from camcorder settings