Merge "[Spa] Support override dialog window type" into main