Merge "Revert^2 "Add patch for tvview callback run in single thread."" into main