Merge "Modify ripple for cancel button in search bar in widget picker." into sc-dev