am cbd59e02: Merge "Don\'t restore debug preferences"

* commit 'cbd59e02a97dac53ec97f59c1a638bc421ba4a52':
  Don't restore debug preferences