Merge "Unify dispatching timeout constants"