Merge "Improve consistency in focusAfterDescendants behavior" into oc-dev