Merge "Fix launcher navigation issue when using a controller" into sc-dev