Merge "Migrate the remaining instances of the dreamManager.finishSelf method to the new oneway version." into main