Merge "Don't restore debug preferences"