Merge "Handle edge-case where no focusables exist" into oc-dev