Merge "Fix  ordering of resource libraries for Quickstep build." into sc-v2-dev