Merge "[Expressive design] update preference background with round corner" into main