Restore change
Add regression test case for ScopeIf preview and watch