Merge "Fix focus ordering with duplicate ids" into oc-dev