Merge change I56779290 into eclair

* changes:
  fix[2222341] Soft reset while going back from camcorder settings