Merge "Revert "Update getPrimaryHorizontal"" into oc-dev