Merge "Select remote apps based on stagePosition instead of hardcoded values" into sc-v2-dev