Merge "Fix crash when restoring SearchView." into nyc-dev