Merge "Fix crash when restoring SearchView." into mnc-ub-dev
am: 5e775842f6

* commit '5e775842f60aa1e402a6f90849a4c0d169dcc38f':
  Fix crash when restoring SearchView.