Merge "Reuse widget picker's surface color in add item dialog." into main