Merge pull request #4850 from lioncash/redundant Core: Remove redundant returns in FifoPlayerThread() and CpuThread()