Merge "Delay SearchView preparation" into ics-mr1