Merge "Improve rect-level focus ordering" into oc-dev