Merge "Do not change launch mode to FF is FS explicitly requested" into sc-v2-dev