Merge "Fix flaky SearchView_CursorTest" into oc-dev