Merge change 26081 into eclair

* changes:
  workaround for [2113743] Sholes: frozen then runtime restart going to list view