Merge "[controlbar] remove shadow icon"