Merge "Support an x-coordinate for fps location" into sc-v2-dev