Merge "Revert "Merge restartInput into startInput in internal IPC""