Merge "Ensure the current controller when handling a remote call in the Shell" into main