Merge "Handle edge-case where the focus-search root is focused" into oc-dev