Merge "Fix device ordering" into sc-v2-dev