Merge "[Spa] Support dialog in NavHost" into main