Merge "Separate icon sizes for sharesheet and resolver list."