Merge "Don't throw ANR if onTimeout flag is disabled." into 24D1-dev