am 6e35b50e: Merge change 26715 into eclair

Merge commit '6e35b50e8d77ff16ffbcac88f421c7091d1c9b8c' into eclair-plus-aosp

* commit '6e35b50e8d77ff16ffbcac88f421c7091d1c9b8c':
  fix [2133214] STOPSHIP: revert I4a06bb4f: workaround for [2113743] Sholes: frozen then runtime restart going to list view