Merge "Revert "Update the usage of receiveFinishedSignal"" into sc-dev