Merge "[Expressive design] Update SPA Appbar." into main