Merge "Increase the keep alive time for internal executor thread" into main