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