Merge "[Spa] Fix CustomizedAppBar height error" into main