Merge "[Compat UI] Enable SCM Restart Dialog by Default" into tm-qpr-dev