Merge "Added test for user-specified focus order with duplicate ids" into oc-dev