Merge "Start saving iconified state of SearchView." into nyc-dev