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

* commit '2d90bb3ef8bd48bddbf773d903a79101c478fc61':
  Fix crash when restoring SearchView.