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

* commit '6c4d136d312f8ecbe059b9833c94561849902731':
  Fix crash when restoring SearchView.