Merge change Iff5b8ce3 into eclair

* changes:
  Work on issue 2259506: camera ANRed and then device runtime restarted