Merge "Fix FSI not launching when locked" into udc-dev