Merge "Fix crash when restoring SearchView." into mnc-ub-dev