Merge "SearchInputWidget: Replace pushPending hack"