Merge "Don't throw ANR if onTimeout flag is disabled." into main