Merge "Don't consume all BACK keys in SearchView" into pi-dev