shade is collapsing search and list to be just list. Do the same before we lock the API for consistency. Change-Id: I57e227e4edbc1ce8b518f702094d8a594ae6c7b0
Change-Id: I00b2f9d14bed83a53c31644ad6996136a900271a